From 3eacf2c33c7699100c83ec2174cf7b9f0d2d1bba Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Wed, 20 Mar 2002 17:09:57 +0000 Subject: [PATCH] Fix segfault when widget->parent is NULL. (#75615, Alexey A. Malyshev) Wed Mar 20 12:06:30 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_set_child_visible): Fix segfault when widget->parent is NULL. (#75615, Alexey A. Malyshev) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkwidget.c | 2 +- 7 files changed, 37 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6213322040..d3dbb38803 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Mar 20 12:06:30 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_child_visible): + Fix segfault when widget->parent is NULL. + (#75615, Alexey A. Malyshev) + Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 6213322040..d3dbb38803 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Wed Mar 20 12:06:30 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_child_visible): + Fix segfault when widget->parent is NULL. + (#75615, Alexey A. Malyshev) + Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 6213322040..d3dbb38803 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Wed Mar 20 12:06:30 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_child_visible): + Fix segfault when widget->parent is NULL. + (#75615, Alexey A. Malyshev) + Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 6213322040..d3dbb38803 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Wed Mar 20 12:06:30 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_child_visible): + Fix segfault when widget->parent is NULL. + (#75615, Alexey A. Malyshev) + Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 6213322040..d3dbb38803 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Wed Mar 20 12:06:30 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_child_visible): + Fix segfault when widget->parent is NULL. + (#75615, Alexey A. Malyshev) + Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 6213322040..d3dbb38803 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Wed Mar 20 12:06:30 2002 Owen Taylor + + * gtk/gtkwidget.c (gtk_widget_set_child_visible): + Fix segfault when widget->parent is NULL. + (#75615, Alexey A. Malyshev) + Wed Mar 20 11:32:07 2002 Owen Taylor * gtk/gtkentry.c: Improve test to prevent infinite diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index 550f5ebda3..9f73dd0c00 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -4526,7 +4526,7 @@ gtk_widget_set_child_visible (GtkWidget *widget, GTK_PRIVATE_SET_FLAG (widget, GTK_CHILD_VISIBLE); else GTK_PRIVATE_UNSET_FLAG (widget, GTK_CHILD_VISIBLE); - if (GTK_WIDGET_REALIZED (widget->parent)) + if (widget->parent && GTK_WIDGET_REALIZED (widget->parent)) { if (GTK_WIDGET_MAPPED (widget->parent) && GTK_WIDGET_CHILD_VISIBLE (widget) && -- 2.30.2